Add git diff mode to CLI #1724
Merged
Add git diff mode to CLI #1724
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sugmanue
approved these changes
Apr 6, 2023
mtdowling
force-pushed
the
diff-project-mode
branch
from
9154017
to
98d5ff1
Compare
mtdowling
force-pushed
the
add-git-diff-mode
branch
8 times, most recently
from
ea0b4c0
to
eb144e1
Compare
This commit adds support for running Smithy diff using a "git" mode so that the current state of a project is compared against the previous state of a project. By default, the previous state is the last commit of the current branch: ``` smithy diff --mode git ``` You can compare against a differet commit using: ``` smithy diff --mode git --old HEAD~2 smithy diff --mode git --old main ``` The way this works it that `git` mode is a wrapper around `project` mode. Smithy will create a git worktree for a specific branch named `__smithy-diff-worktree` located at "build/smithy/diff-worktree". Each time the command is run, the worktree is either created and pointed at the correct commit, or uses `git reset --hard $COMMIT`. When creating the worktree, we first call "git worktree prune" in case the worktree was previously created and deleted from a `smithy clean` operation.
mtdowling
force-pushed
the
add-git-diff-mode
branch
from
eb144e1
to
6bb1bd9
Compare
sugmanue
approved these changes
Apr 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds support for running Smithy diff using a "git" mode so that the current state of a project is compared against the previous state of a project. By default, the previous state is the last commit of the current branch:
You can compare against a differet commit using:
The way this works it that
gitmode is a wrapper aroundprojectmode. Smithy will create a git worktree for a specific branch named__smithy-diff-worktreelocated at"build/smithy/diff-worktree". Each time the command is run, the worktree is either created and pointed at the correct commit, or uses
git reset --hard $COMMIT. When creating the worktree, we first call "git worktree prune" in case the worktree was previously created and deleted from asmithy cleanoperation.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.